* lisp/emacs-lisp/bytecomp.el (byte-compile-file): Use let.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6de9baa11893025c6c1922e7f4aac12d70c7b8e..f01ef60c35a39dbe58416b4350eda6b7d4aeb46e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-25  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/bytecomp.el (byte-compile-file): Use let.
+
 2013-02-25  Juri Linkov  <juri@jurta.org>
 
        * replace.el (read-regexp): Let-bind `default' to the first
@@ -57,8 +61,8 @@
        (tramp-default-method): Adapt check for
        `tramp-ssh-controlmaster-options'.
 
-       * net/tramp-sh.el (tramp-methods): Replace
-       `tramp-ssh-controlmaster-template' by "%c".
+       * net/tramp-sh.el (tramp-methods):
+       Replace `tramp-ssh-controlmaster-template' by "%c".
        (tramp-do-copy-or-rename-file-out-of-band)
        (tramp-maybe-open-connection): Use it in format spec.  Ensure,
        that it is applied for the first hop only.
@@ -80,8 +84,8 @@
 
        * net/tramp.el (tramp-tramp-file-p): Fix docstring.
 
-       * net/tramp-sh.el (tramp-sh-handle-insert-directory): Handle
-       multibyte file names.
+       * net/tramp-sh.el (tramp-sh-handle-insert-directory):
+       Handle multibyte file names.
 
 2013-02-22  Glenn Morris  <rgm@gnu.org>
 
@@ -104,8 +108,8 @@
 
 2013-02-21  Fabián Ezequiel Gallina  <fgallina@cuca>
 
-       * progmodes/python.el (python-info-current-defun): Enhance
-       match-data cluttering prevention.
+       * progmodes/python.el (python-info-current-defun):
+       Enhance match-data cluttering prevention.
 
 2013-02-21  Glenn Morris  <rgm@gnu.org>
 

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index e0837033c7471e973bad41ff21cd4fa88f49bfc3..5db1793a4077fe46e7007fd6d6b610656bb42f0c 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1781,15 +1781,13 @@ The value is non-nil if there were no errors, nil if errors."
       (when byte-compile-verbose
        (message "Compiling %s..." filename))
       (setq byte-compiler-error-flag nil)
-      (setq byte-compile-level (1+ byte-compile-level))
       ;; It is important that input-buffer not be current at this call,
       ;; so that the value of point set in input-buffer
       ;; within byte-compile-from-buffer lingers in that buffer.
       (setq output-buffer
            (save-current-buffer
-             (unwind-protect
-                 (byte-compile-from-buffer input-buffer)
-               (setq byte-compile-level (1- byte-compile-level)))))
+             (let ((byte-compile-level (1+ byte-compile-level)))
+                (byte-compile-from-buffer input-buffer))))
       (if byte-compiler-error-flag
          nil
        (when byte-compile-verbose